From f26c47e0fd88d0dc2db9f6a1c23b8e1640986932 Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Fri, 2 Dec 2005 12:55:00 -0600 Subject: [PATCH] Minor changes due to file movement to merge xen-unstable with xen-ia64-unstable --- xen/arch/ia64/Makefile | 2 ++ xen/include/public/io/blkif.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/xen/arch/ia64/Makefile b/xen/arch/ia64/Makefile index 94ddb88a79..373b22f076 100644 --- a/xen/arch/ia64/Makefile +++ b/xen/arch/ia64/Makefile @@ -69,6 +69,8 @@ $(BASEDIR)/include/asm-ia64/.offsets.h.stamp: [ -e $(BASEDIR)/include/asm-ia64/xen ] \ || ln -s $(BASEDIR)/include/asm-ia64/linux $(BASEDIR)/include/asm-ia64/xen # Link to DM file in Xen for ia64/vti + [ -e $(BASEDIR)/include/asm-ia64/vmx_vpic.h ] \ + || ln -s ../../include/asm-x86/vmx_vpic.h $(BASEDIR)/include/asm-ia64/vmx_vpic.h [ -e $(BASEDIR)/include/asm-ia64/vmx_vioapic.h ] \ || ln -s ../../include/asm-x86/vmx_vioapic.h $(BASEDIR)/include/asm-ia64/vmx_vioapic.h [ -e $(BASEDIR)/arch/ia64/vmx/vmx_vioapic.c ] \ diff --git a/xen/include/public/io/blkif.h b/xen/include/public/io/blkif.h index 44780ced7e..ef95576f16 100644 --- a/xen/include/public/io/blkif.h +++ b/xen/include/public/io/blkif.h @@ -11,6 +11,8 @@ #include "ring.h" +#include /* for grant_ref_t */ + /* * Front->back notifications: When enqueuing a new request, sending a * notification can be made conditional on req_event (i.e., the generic -- 2.30.2